Fix uninitialized width variable.

2007-01-04  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtklabel.c (get_layout_location): Fix uninitialized width
        variable.

svn path=/trunk/; revision=17069

diff --git a/ChangeLog b/ChangeLog
index 2f81d6a806ac90cf7e0c2efd7a94a58893b3e714..a617e1476a753817acbc67a76caf887d2f86bd61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-04  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gtk/gtklabel.c (get_layout_location): Fix uninitialized width
+       variable.
+
 2007-01-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/Makefile.am:

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index d58754e7f7663ce66fb99fa8f318446c54631e7c..219f01e898bdd53a35561ca7e068ea13679b6ee0 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2298,11 +2298,11 @@ get_layout_location (GtkLabel  *label,
       int width;
       PangoRectangle logical;
 
+      width = pango_layout_get_width (label->layout);
       pango_layout_get_pixel_extents (label->layout, NULL, &logical);
 
-      req_width = logical.width;
-      if (width != -1)
-       req_width = MIN(PANGO_PIXELS (width), req_width);
+      /* width may be -1 */
+      req_width = MIN(PANGO_PIXELS (width), logical.width);
       req_width += 2 * misc->xpad;
     }
   else